* nsterm.m (ns_draw_window_cursor): Fix typo in 2011-02-23 commit.

diff --git a/src/ChangeLog b/src/ChangeLog
index e07b74a35ee7f3be97523ac3678798481bf8542f..57a2b618d6345e24d9663e7a7cb18f3d2bc608ff 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-05  Chong Yidong  <cyd@stupidchicken.com>
+
+       * nsterm.m (ns_draw_window_cursor): Fix typo in 2011-02-23 commit.
+
 2011-03-02  Ken Brown  <kbrown@cornell.edu>
 
        * sheap.c (STATIC_HEAP_SIZE): Increase to 13MB.

diff --git a/src/nsterm.m b/src/nsterm.m
index 4c47e65dc964abbe48134aa7f205f128918aaf0c..9237205a0f4e03b5044b0712d809e76df7bfc8ac 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -2283,8 +2283,7 @@ ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row,
   if (cursor_type == BAR_CURSOR || cursor_type == HBAR_CURSOR)
     {
       if (cursor_width < 0)
-       cursor_width = FRAME_CURSOR_WIDTH (f);
-      cursor_width = min (cursor_width, 1);
+       cursor_width = max (FRAME_CURSOR_WIDTH (f), 1);
       w->phys_cursor_width = cursor_width;
     }